Refactored games index, fixed join from index