Collection Search fix