Update paths, fix bug with HTML entities