Changed the colourings and query data border to remove confusion