Feature/simplified filter ux 2649

Fixes and Enhancements