reverted adding "TABLE" as a keyword as it breaks too many unit tests. "Database" is added and i had to modify the SQL within one unit test to get that to pass but yet sure that is the best way forward. #2