Map restructuring to pass options per-Map rather than globally. Split
s3.filter.js from s3.search.js.