ASL-31 fix. Search-view FF fix