Merge "Fix param type of search terms in search related classes"