local/remote sync
backend bug fix