Added 'deep' search option for more specific types, closes #2