Refactor contact select options
Fix a couple of bugs in site/clients