GeoBosh refactor and improve tsdiag