added automapper small fixes