Fix small bug on searches
WIP