1. Amended some locations and added missing ones

    Closed
    #172672870 48 0 8 0