add number filter; minor tweaks