Active class not set on sort options when sorting was active
Merge branch 'develop' into feature/dynamo3