Fix broken URL generators for entities that have string IDs, refs T696