Fix to work with new docs schema