More hacks for tab complete with sub menu and commands