Added additional reverse lookup data to several views