Fiixes #1559

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1578 from live627/url-entities

Fiixes #1559