Fixed issues with find by path.