Update in code to handle contains-any qualifier