Fixed no-filter error.
Improved variable setting in other sections.