bug fixes and tests around empty fields; added qualifier to annotation output