More Warp List improvements