Display link from the subquery output to the main output
Refactor constants, fix output tables not highlighted