Resource collection template, fixes