Generic ODBC does not show databases correctly for AWS Athena

I am using the latest version of Toad Data Point. I have setup an ODBC driver to connect to AWS Athena. When I connect to the driver in Toad it's showing all databases and tables in one database called "AWSDataCatalog" rather than showing the actual databases.

Anyone else having this problem? I'm not sure if this is a problem with the generic ODBC connection or the Athena driver?