Small changes to get indexing to work correctly, will need to further debug CreativeWork class