Additional Changes on portfolio search