Fix issue in search