'Next' problem queries bugs fixed
Merge remote-tracking branch 'github/master'