Change name select list wrapper #68