Fix fiwaretheme landing_page support
Show a message when no resource is found when searching in the catalogue view
Add more tests for the merge service