Fix mapping bug. Mappings with more than one property per type were incorrect
Adding filters