Fixing search (without pagination)