Upgrades to how the filter search works