Fix escaping to prevent 404