Tag Query performance Improvement