Merge pull request #1343 from harvesthq/option-group-sarch

Search Optgroups
Merge branch 'master' into remove-id-dependency