add query

add query and related updates to overlay and container, results, etc
Merge pull request #4 from btfou/master

add query