TRUNK-3835 Fix searching for 'of' in concept name