Don't include optional fields if they are blank