Updated getAll, getFilteredMatches and getTypes to return maps with type as index