Add look-up values for floor type and location
Various query updates for Loddon