fix/imrpove table results