#869,#855,#897 Fix for missing search information