Refactoring map search - add filter for type/shipyard/model