Make shop sections with [command] work again
Fix advance menu being shown twice in 3p