Fixed logic in forward archive linking