#1351 - fixes to question count