More changes to indexing and querying. Index master and overrides so we can retrieve them and do correct caldav style searches.