[#84108742] catalog filter refactored