focus view
Merge branch 'refs/heads/filter-query' into crazylayout