Fixed selection validation & Renamed out variable