Added Criteria queries to Category & Tag