Add Firefox ESR and direct queries