Add popup lists and fix variable name in solution

Bug 2734