Updated queries to fit with new contentprovider