PIA Update: Spot to place

Also legend update and place to query