small filter and uxf changes