The Duct tape fixed part of the problem.

Guess what I used to cover the tabs on Jordans diaper? Bingo! I won't have to chase him around putting his diaper back on any more!