Properly fix the issue that !528 tried to; let the -warp parameter work with map name See merge request !596
