improve handling of single item lists