Remove query from public list when it's destroyed

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Merge pull request #709 from cbmi/issue-708

Remove query from public list when it's destroyed