Small Update

Query view and data view.