added better resolving of base document finder