separte makeQuery and query methods
remove --watch flag so that codeship can verify build