1. Added escaping for url
2. Added more sanitisation