Fixed Map ratings not being saved sometimes
Merge branch 'fixes' into dev