dispatcher and data-el rework also adjusted input focus