bugfixes and improvements to rpi search