* Refactor queries to be able to add component easily * Fix: never display empty maps * Fix: missing locales