add handling for standard user fields and more operators