provide a more robust fix to prevent filter conditions from being deleted

This was spurred on by #2832, and effectively replaces #2523.

TL;DR it was the filter form's problem, so the resource extension
shouldn't have been trying to compensate.