fixed ngGrid issues