No .distinct unless there's a query

Avoid calling distinct unless we're actually doing something to the query.