Added unless attribute, fix dynamic values for dates