Merge branch 'feature-search' of gitlab.fi.muni.cz:xkastovs/dumpster-fire into feature-search