Fix bug with empty criteria
Fix bug with empty criteria
Add external parameters for embedded links generation