added elseif for search with no filter