Updated ANY value's to use flavorId
Added back in handling for facility locations
Merge branch 'nonnull_update', fixes #160