Temp fix for handling non-string ref attribute vals

 * Entities in ref name weren't expected

 * Fixes the crash from arwiki:تأثير_الدمعة_السوداء

 * Makes use of the fix from de3642b8dd4a804ac654f2943a900496f2c8b3f3

Bug: 63790
Change-Id: Icb8781b4d9decc5a8b115d0b11def4d18f5d5025