Add back disabled test
Document nested query and sort