Fixed problem with empty strings for annotation values