Content provider optimization, contacts provider fixes