Added queries and new category_tag intersection entity.