Added check for non numeric value for selection