Repair to content locater and forwarding

Repair to content locater and forwarding