Fixed a few issues related to the data validation and WBTD