Fix for managing searches