revert back psql settings, simplify code
revert back psql settings, simplify code

YaroslavLitvinov/gizer,VarchukVladimir/gizer,VarchukVladimir/gizer,VarchukVladimir/gizer,YaroslavLitvinov/gizer,YaroslavLitvinov/gizer