(#4) Moved query subtype field