used a dictionary vs n-query method for data display.  Closed issue #4