#24 more fixes for undefined index notices on certain themes