Fixed issue with crashing after search