Added metadata stores search service and miscellaneous updates to other
files.