DEVELOPER-358 use sys_type for search