Fix bug in Table and Charts view