refactoring missing filter, move from SqlParser to Maker to support more identifiers in the future.