Fixing Search URL issue