Updated hardcoded select values to variables