Issue #154 and #146

During implementation of #154 implemented #146 too.
Live on the [staging environment](https://gdetracking.gweb.io/hist/points_to_firefly/)