Some bugfixes in the search result draft