added email to obj edit
Updated elastic to use new query definitions