Bugfix/vov 1821

Will still need to reindex everything after this gets merged.