Query performance enhancement