Will this actually work with a `nil` query? If not we shouldn't have it as a default argument.