speedups for tree view and control mapper.  Not optimal yet but better than before