The additional queries were unnecessary, these changes search ONLY for what we care about, none of the extra stuff.