#75 Added Itemid to links in filtering