ido-hacks improvements for e24