Improving TagQuery, force index when adding tag slots