Merge pull request #922 from nupplaphil/bug/7989-advancedcontfilter