esr17, as well as tag tweaks