Changed admin filters to selects
Merge remote-tracking branch 'origin/master'