Handle scalar sub-requests on parser side
Fix JOIN display