fix ContentProvider bugs