corrections to dataviews and highlighting
tried to merge minor changes from cr-xq-dev regarding data-view