Fixed a bug in the mappers regarding the select preparation stage