Fixed.

And some parts was moved back to BEMHTML. :-)