Only initialize once, temporary hack.
Minor fixes and visiblity on the filter object.