Handle Dates as primary key - Related to #1335
Merge branch 'michel_1335_suggester_dates' into next