UPD: fix comment model issues on PostgreSQL