More fixes for mixed type queries.
Fix typo.
Fix name collision auto-triggering widget function
Minify