Bugfix for 1931 as well as a major overhaul in the presentation of the search results.