Added an additional filter on ObjectId()