added location fields
modified select method
mapping of demographics