FOP2 bug fix and filter length fix