Enhance the filter per categories scenario