Query and callbacks
Merge branch 'master' of https://github.com/ideus/notes