Fix issue when adding multiple filters causing the wrong type to be picked