Bugfix for categories & tags causing issues