Todo: ES and ASTRO file explorer fix