Merge branch 'search_display_refactor' into apache-blur-0.2