Changed filter handling according to http://stackoverflow.com/questions/26176496/angularjs-basic-filtering-works-as-union-instead-of-intersection