Slight restructing to work on label filter submenu.