Fixing bugs related to incorrect behaviour for EmailContactParsingJob