Instead of addressing each one at a time, I have put together a commit/PR to address this issue that was introduced into the admin variant handler. It can be found here: https://github.com/mc12345678/Stock_By_Attributes_Combined/pull/70/files

The red represents areas "removed" the green are areas added... Also the line numbers are based off of the software there in github and may differ from what you have on your system, but the surrounding code should relatively relate.