fix for date field and English language labels
changes required by collect-core master branch
merge