Merge branch 'feature/better_search' into develop