Support groups in select
Fix add contact modal options