Merge "Query without a subid uses the default subid"