Added placeholder to list of values and fixes