query patch
patch to query

Merge branch 'emax'