Fixed %20(instead of space) problem