Removing query order dependency from spec