Fixed report graph and table