Filter by Company OK

## v0.2.0203
## for ticket [163]
Ready to merge back to master