fix #20. refactor EstimateSelector.