Update admin filtering options for connections
Merge branch 'master' into staging