Correction in FilteredDataModel class and optimization.