EM: Fix catalog management
FIXME: Warn on duplicate table mappings in dashboard schema