Added new query & index setting