Sometimes this (https://zeroturnaround.github.io/sql-formatter/) does a better job for me. Doesn't support Postgres explicitly but works most of the time.