Add ability to query by category