Implements #435 Moderation Tools Improvements