Implementation of Issue #131

Leveraged Matti's code from the Category view