Fix undefined index for new resources
Temp. disable caching to API, removing 'Finish'-Button