fixed mapping, persisting results in database