Update jpql to the latest form required by domgen
Remove link to non-existent library
Revert incorrect variable extraction