Merge search function to master