Filter wizard fixes

Pulled this from the master. Its in the omx-importer which no longer exists.