Plans for Terror Inquiries Still Fall Short, Report Says