Query class changes in EAV module