PR changes

* Change thead tbody order
* Fix queries and dates