Fixed mismatch between numbers and calculated numbers for rest of attributes

2 jobs for feature/fix_mismatch_numbers_total_floor_area in 2 minutes and 13 seconds (queued for 1 minute and 1 second)