Load geochart package
Refactor state DB
Map filtering on new table schema
slight code reformatting