Ref #27 - Some final cleanup on the filter code in JSON demo activities.