Fixed Search

Try to add this Fix Search again after rebase.