slight fix to prevent empty tag values