Added ability to search on types.