Fix map system selection