fixed wdate and pweek from expression style to regular