add 'filter' option and "Atom" Builder