refactor filter building a little bit to handle the basic number filters