fix mappings and use hard coded instance id to work for app content type...

.... Parameterised version to follow