FIX: small refactor
CHANGE: Init from ES
FIX: Users are now a closed set of ALL_USERS (currently 100k)
Merge branch 'master' into bl