Figured out why we're returning too many results, bit more testing needed before I'm confident though