Fixed soft deletion and date bugs