fix select mapping