actually use the includeFilter, and also append other mappings