Update Java EE PA queries for 3.3
Update Web PA queries for 3.3