Redoing FILTERDOC fix for 1.8.3 #1565