Add table visualizer and better label visualizer. Changed DataQuery to include Criteria in the query.