Resource controller code refactoring
Add select to validator's form
merge conflicts