Enhance Underlying search to match more than 1 underlying