Refactor filter commands as normal limit command

Solves #40