Fixed queries search and remove