fix for values/values_list behaviour in ES