Now supporting search by type