Improved Documentation
Improved Query Variable Handling (Extract, Replace)