Change to filter and only filter after falling back to updating live