Code clean
Move relevant expression above min/max count
OFC-1175 Exception when importing survey
OFC-876 Complete form validations