[Layout]: Fixed issue for PgSQL database