PMO-2441: no longer use the filtering table tree model
fixed merge