fixed no search results logic
fixed merge conflicts
fixed merge conflicts and addtional logic stuff with non-valid searches