menu and regexp fix