Make the query helper a bit more flexible by allowing extra params