Bug fix: if the predicate doesn't contain a ":", it should use NameReferenceHandler