Added company filtering. Issue #13