The QueryService already provides these so we should DRY this up