I would prefer putting this username conversion hack into a function, which can be called from both the list and the non-list branch, so that there is no repetition ... but this is already intended to be only a temporary hack, until ES index is really changed, I guess it does not matter too much.