intermediate fixes
Merge branch 'bugs' into 0029-search-lazy-load