Fix merge error
Remove unneeded manual link query widget
Merge branch 'master' of github.com:kreativkombinat/atx