Refactoring of search param builder hierarchy