WIP: additonal har filtering bug fixes