shop catalog bundle filters refactoring