Add support for grouped_collection_select