fix undef var
fix query mot query bug
Merge branch 'master' into RELEASE_20140325