Rewrote the filtering to use extendable objects. Much more flexible.
Code cleanup.
Removed the 'data' level of the mappings. Wasn't being used.