Switch to using AcctUniqueId for accounting queries in PG