force terms to be not considered in @id
@reverse for literals
fixed NPE
disabled @context flattening