small improvements to datamapper finder