Revert "Revert "Fix for the moment and ruRU missing  close tag fix""

This reverts commit aba4e8a582f9cb0799b398cd1bbc9ce6f88b5131.
Revert "Fix for the moment and ruRU missing  close tag fix"

This reverts commit d27c01540bd56098df5667cd02f4ad938a91c15b.
Revert "Revert "Fix for the moment and ruRU missing  close tag fix""

This reverts commit 0ac1069f15bf31b3c136a0a806069b84b4934d84.