can you please show errors? i tested a lots of cases, all 100% are correct. of course, some places must be totally not "reservoir" before but this just makes correct usage of new tags.

this is straightforward fixes that do a lots of good things, is not it?
