Rename buildQuery() to enhanceQuery()