Fix for missing indexer field definitions