Further tweaks for keywords editor tab support - in progress