Add default mapper and refactor mapFilter to return error if nothing handles

Closes #2318