Fix update and use service locator for hydrator and filter