Search and MOMathon changes

Stephanrequested to merge
github/fork/StephanMa/search into master

Created by: StephanMa

This change is Reviewable

Merge request reports