Query samples (provided types & runtime), tweaks