- some fixes to use filters for links