US632 - fix dynamic date field id issue