Current path now shows entity
Fixed #196, now use entity when determining current tag