add tooltip and label fields