#636 Fix multiple issues with lists
#637 Da return of da code button