Improve syntax on NDB queries
Grammar