Updated the filtering to contains instead of starts with.