[NUCJPA-286] Fix MapKeyColumn handling