Dinocatalog

Refactored filters, changed mappers to use hash, few other name changes. 
this should be done using a filter or search ....