added filter to links, major updates