220c220,227
<                     targetList.AddUnique(GenericMapping.Map(match));
---
>                 	if(GenericMapping.EntityNeedsMapping(match))
>                 	{
>                     	targetList.AddUnique(GenericMapping.Map(match));
>                 	}
>                 	else
>                 	{
>                 		targetList.AddUnique(match);
>                 	}