PAHMA-921: chance a couple LIKES to ILIKES
PAHMA-811: KIR/OIR fieldset fixes, remove getHierarchy() again..
PAHMA-917/NOJIRA: Quote handling and aligning with jblowe