Fix: allowed unit list for annotation should be retrieved explicitly