Added filtering to the non-split versions.  It's about time to change
these scripts into a generic one with a configuration file...