core-5924 fix auto refresh of fav. view.
core-5924 refactor code.