improve mapping for quickrun