Fix date fields and multi select content locations