Merge for amenity post request and toggle amenity functionality - fixed

the last pull req was nearly functional but this will now always attach amenities to correct trip