Fixed the lost field parameters, and added unit parameter. Ticket: #1546