To test the Query: changes and recent implementation