Fixing validation to accept more than text fields