Clear loading timeouts if an error modal is triggered
separate "TODAY" variable from ajax loading - make it part of the constant
Fixing merge conflicts from upstream