fix for hidden options

I discovered that in some cases Global hidden options were causing a NPE due to the collection transform returning a null;

Also, fixed places where hidden options were still being displayed