fixed quote namespace, new quotes, more wps