Improve search function performance
Merge branch 'master' of github.com:TeamTuring/whiteboard