better subject parsing