dateInputs and collectionSelect added