bugfixes, search repositioning