Adding search_field support (closes #42)