Added catalog filtering