Adding entity field search