Search views fixes