Fixed subject parsing