Issues: Tweak label selector once more