Yep that's both the water trap and the filter. Hard to know how long those filters might last sadly. Or if they do much at allSo this would be the setup to get then?
30Mpa High Pressure Air Filter External Water-Oil Separator Two Stage Filtration for Air Compressor Air Pump Scuba Diving https://www.amazon.com/dp/B0784WBFPT/ref=cm_sw_r_cp_api_glc_fabc_fjm.Fb82BW0R4?_encoding=UTF8&psc=1