Revert "Refactor favorite questions"

This reverts commit 316dac8ba427450252005e1cadc0f1240ccd32a8.
Refactor favorite questions
bug fix