[delivers #62492392]

Complete functionality for automatically being added and removed to the
right category (empty/active) also solved the problem of the controller
running twice when navigating to or refreshing the page