fix for NPE in OriginType as well as updates to webapp privacy pages