Bugfix to Device Searches