Fixed question type filtering
Solved mark and automark issues