Resolve #561: "Something wrong (?) with the result of the search and the pages" Closes #561 See merge request !579