Added function to fix the smart select names