Merge "Revert query handling of subid"