Wire restrictive source selector with query parameters
Merge branch 'querydecomp' into queryobserve