more fixes dealing with data extraction methods