split generic mapper into pre-filter and entities