[MERGE] stock_*: search view update