Fixed more unrequired search strings from being created and wasting our time doing duplicate searches