Adding search through filter. Search class no longer needed