moar tweaks to search, fixing relationships everywhere