Fixed issue that could result in double searches