Fixed scoping on Spice helpers
Added ability to mix city codes and city names in query