Less than optimal solution to getting around required index fields