Fixed some stuff with content discovery tool