improved search + fixes