Dashboard token eval statement not working after upgrade (v6.3.5 > v6.6.3)

We have a dashboard that is specific to 2017. So, the latest time needs to be either the start of the current day or 12/31/2017 (once we reach 2018). We are using the below eval statement to set the latest token and it was working fine until we recently upgraded from 6.3.5 to 6.6.3. After the upgrade I could not get it to work no matter what I tried. if(now()>1514782800,1514782800,@d)Date RangeTodayHistoricaltrue@dnowtrue if(now() > 1506830401, 1506830400, @y) if(now() > 1514782801, 1514782800, @d)