Changed OR to AND in filtering
Fixed dependencies
Fixed activeLink