Revert "remove incorrectly used <tbody>" and fix tbody usage

This reverts commit b41c21a61b1800bd44ab61b70e021279864933b1.