query fix - always return array of blocks