Fix middleware issue
Fix timestamp dates