Issue #24866:define all target types in query
Merge pull request #545 from garyhgohoos/24866

Issue #24866:define all target types in query