Amenity incorporated into the primary key
- Adding "amenity" as second component of the PK
- Refining data to only include rows (a) which have a relevant "amenity" value and (b) are located in one of the locales used by the demo
- Updates to the Docker image to reflect this