Cleanup && added variable spatial mappings for elasticsearch.