Solved No longer able to setup safe mode in BCDEDIT on new PC

I have been using the instruction from "Safe Mode - Add to Windows Boot Manager in Windows 8" for a very long time to give me that extra chance to get into Safe Mode if Normal Mode is having problems. All of the Windows 8/8.1 PCs at our site are set up that way.

Just got a Lenovo Flex 2-15 with Windows 8.1. It allowed me to add the 2 entries that I always add to the Boot Manager (Safe and Safe with Networking). And I can see them there in MSCONFIG. But when I boot up, it just ignores the extra entries and just comes up in the main OS entry. Not only that, but then I discovered that F2 and F12 at boot up stopped working as well. So then I removed the safe mode entries and now I can do F2 and F12 at boot up just fine.

This PC is using Secure Boot and UEFI. And I'd like to continue using those. Has anyone come up with a way to add the safe mode entries in the Boot Manager and have them work?

Since I want to keep the newer EUFI and Secure Boot, I decided to use the command "bcdedit /set bootmenupolicy legacy" to make pressing the f8 key usable again and forget trying to add fake multiboot entries to the Boot Manager. Now I can get the same effect and eliminate that extra menu at the beginning which was only there in case I needed it. And then if I have a specific reason to use the Windows 8/8.1 troubleshooting, I can switch back using "bcdedit /set bootmenupolicy standard" whenever I want to. The other thing I found researching this is if I hold down the shift key when I click on restart, it automatically goes into troubleshooting mode, giving me the other options like system restore and such...the safe mode part still comes up ala windows 7, but the rest looks like the Windows 8 troubleshooting I've grown use to. So this is solved as far as I'm concerned.