Need to watch for changes to effectiveDateEnabled

Hi Gueorgui,

Seems like json is not populated correctly. This PR is just to highlight the changes I made but it still doesn't fix it correctly. 

Cheers,
John