Modularise Categories Queries