op shelves are heroes, hide hero collection if one is visible (bug 923236)

some fixes
check for existence of 'image'