Switch Query and QueryEngine to checks only

Change-Id: I0be4f86d2b862ee83ea1d6fa8a812d83f2b6cce8