add remaining fields to regex
fix index issues