improve macro for Entity.mapper when has Option[Has[T]]