QueryParser: Adjust visibility order