changing the default to contains and fixing from the comments in #2002