Added support for hidding outlet collections

Sample updated as well
Code cleanup

Code cleanup