Fix for Search crashing the app