filtering changes, link handler fix

filtering changes, link handler fix