make 'query' key optional on inspetor Model
Merge branch 'master/chiba2' into master/dubrovka