fixed EE 6 dependencies
matrix -> path params (for now)
fixed sub resource locators