Fixes for new percent base choice config (Fixed #1260 and #1261)