FIXED FILTERING AND SEARCH TO WORK WITH PROPERLY