Use the same tables for data query and mapping

[sobisonator]

The data querying tables and source tables used for GIS should not duplicate the same information in more than one place, rather than existing in two different data directories with the same information duplicated needlessly.