#113 Handle underscores in search links