filtering changes, link handler fix

filtering changes, link handler fix
Merge pull request #5 from DiliBau/master

filtering changes, link handler fix