adding evr org and group fields