Fixed build your list feature