Use the utility function as opposed to re-defining a query.
Merge pull request #351 from jordandukart/7.x

Use the utility function as opposed to re-defining a query.