change Country to ISOAlpha3
made queries case sensitive
remove archon-nouveau template and flatten users json