added filter by company
added filter by company
deleted dumb stuff from master branch