Rearrange comment queries to allow for history