Fixes to search in order to make it return proper haystack search result objects