Fix resolve path bug, refactor of filtering names.