fix balloon click
merged from origin
fixed indentation after merge
fix sync for large number of local files