Fixed issues with empty fields [Report PDF]