Fixed 5 more input validations