Added Id to documents and filters