Changes in SearchDialog and SortDialog classes