Added management of 'not found' annotation set. Now returns a 404.