variables now available as postgis datasource tokens