Bugs fixed for Diagram and Table Options