make annotated object type optional in some hardcoded queries