Fix regression in generic attribute values

 * Introduced in,
   2a3000152f3446041709a4a16fc434dab36695a0
   and,
   d4d3b6a1ce63cbc6b832f00d114e159e14950f41

 * Ex. _rt/plwiki/Nedre_Eiker

Change-Id: Iac546cca5a9e441723c8c8e474b30b7df617a34a
Merge "Fix regression in generic attribute values"