Refactor filter commands as normal limit command

Solves #40 and with cb313f9 also #35