added additional markup to queries