Fix bugs reported by customer

Fix short links
Fix stop words

All issues for this milestone are closed. You may close this milestone now.