Introduce a fallback for ids containing + sign