Added fix for question marks in dates