Fixing zshuffle queries.