Move module directory back.
Add missing import.
Use correct filter rule variable.
Fixup generated condition expression.