add query hints & tips