Major additions to color views, fixes to queries