Better way of handling coming back from tag viewer (the new name for the tag thing)