add handling of gdl:f for saao
discontinue P2 escaping of underscores in pg args