Merge with master. Search result and object type filter.