Merge branch 'improve-search' into 'develop'