Update sample queries for new organization type (see #5 and #50)