Fix validateMoneyByYears multiple conditionals
Fix validateRequiredQuestion multiple conditionals