Fixed set question called twice and list bugs in matching