Fixing some broken queries. More test needed
Picking, saving and loading dates works