Switch on int needs improvement in BP

Or use switch on string and convert the int to string.