LERGO-445 - fixing number of questions in homepage - improved code for "intro" page as well..