Improve property annotation handling
Add support for QuerType annotation #664