Fixed annotate to check if the returned query is a list or not