Merge branch 'hotfix/improved_index_charts'
Atempt to fix damn postgres error
Merge branch 'hotfix/improved_index_charts_2' into develop