Fixed the expand_url filter. Finally.

Thanks @larryprice