Allow double query unsubscribe
Merge branch 'like-queries'