Filter docu, variable fixes