Filter wizard fixes

This file no longer exists. Pulled this one from the master.