NOJIRA Minor filter refactor and future rowfilter sketch