Fix WS

Fix fields to insert, validate date