fixing search
merging