manual merge of filters branch

filters branch merged manually to master. It might be reasonable to change manufacturer filter to reflect new way the filters work.