#66 and #81 tickets for link and table modification
edited query.js
pull from arun