Re-adding logic to manage `other` category for reports