Fixed issues with updating
Started move to reports from the tables