minor fixes
Merge branch 'master' into fixsearching
query updates and consistency.