[AESH-118]
cleanup CompleterData, standarize offset better