AttrName, EntName & ValueFromExpr queries added