fixed some issues with getting tags