Fix subscription path, remove explicit _id vars