Replace queryview reference with queryable as in Serrano/Avocado
Merge branch '2.1' into issue-198
Add shared_queries to core and fix bad subscription reference