rework initial search + fixes