Updated Presto queries to contain catalog and schema in table declaration