Yogesh/Melanie | #0000 | Fix sorting fails over the newly added questions to subjects