Feature/simplified filter ux 2649