minor tag/handle bug fixes