Updated to pull type and foci names from Firebase