Add genre and city to new/edit forms