diff --git a/FichaBackend/Models/Film.cs b/FichaBackend/Models/Film.cs
index 256ee6a..00bbeee 100644
--- a/FichaBackend/Models/Film.cs
+++ b/FichaBackend/Models/Film.cs
@@ -6,10 +6,10 @@ public class Film
 {
     [Key]
     public long Id { get; set; }
-    public string FilmName { get; set; }
-    public string Cinema { get; set; }
-    public string Genre { get; set; }
-    public string Time { get; set; }
-    public float Price { get; set; }
     public City City { get; set; }
+    public string Cinema { get; set; }
+    public string FilmName { get; set; }
+    public string? Genre { get; set; }
+    public string? Time { get; set; }
+    public float Price { get; set; } = 0;
 }
\ No newline at end of file
diff --git a/FichaBackend/Services/IPublicDataService.cs b/FichaBackend/Services/IPublicDataService.cs
index 3bb445a..13b6ad5 100644
--- a/FichaBackend/Services/IPublicDataService.cs
+++ b/FichaBackend/Services/IPublicDataService.cs
@@ -26,7 +26,7 @@ public class PublicDataService : IPublicDataService
 
     public async Task<IEnumerable<Film>> GetAllFilmsInCity(string cityName)
     {
-        return await _databaseContext.Films.ToListAsync();
+        return await _databaseContext.Films.Where(x => x.City.Name.ToLower() == cityName.ToLower()).ToListAsync();
     }
 
     public async Task UpdateFilmsInCity(IEnumerable<FilmDto> films)
@@ -39,6 +39,8 @@ public class PublicDataService : IPublicDataService
             film.FilmName = filmDto.FilmName;
             film.Cinema = filmDto.Cinema;
             film.Price = filmDto.Price ?? 0;
+            film.Genre = filmDto.Genre;
+            film.Time = filmDto.Time;
             film.City = await _databaseContext.Cities.FirstOrDefaultAsync(x => x.Name == filmDto.City);
             await _databaseContext.Films.AddAsync(film);
         }