minor collection fix and grid enhancements