Fix default_scope and improve force sync