This bug report is becoming rather messy. The problem you reported is fixed. The problem you discuss now does not appear to be related to Leap bootloader, because you have problems with manually created boot entries, and Leap bootloader is not involved in any way. I leave it to Michael, but I tend to think this bug should be closed as resolved.