List options improvements