Replace old fetch field with new
Slightly better 404