fixed search a little
fixed merging issues