Re-work the TShark finder