adjusting db q
Merge branch 'master' of https://github.com/pulsarhealthcare/halloween
Merge branch 'master' of https://github.com/pulsarhealthcare/halloween