Grid query in grid

- Added grid query to grid and vice versa.