Make some object-finding logic more filter-driven