make draft handling postgres friendly(er)