Query not being selected properly fix
Merge remote-tracking branch 'github/i2b2-hackathon' into i2b2-hackathon