Change filtering to indexOf instead of ==