Removed queries according to note 5. Closes #16584