Merge/close regression corrected
The logic was not following correctly from the new options
Also (finally!) squashed a corner case for a menu badging issue
Merge pull request #87 from HouseTrip/team-octopus/trailer-1-0-19

Team Octopus/Trailer 1.0.19