improvement and bugfix to add annotation proposals