some improvements to all finder method