Dinocatalog

Refactored filters, changed mappers to use hash, few other name changes.