refactor/unbreaking cfquery