improve Query searching