Pushed fix for event with spaces and a long string like a URL