partial
partial and merge with search
fixes to the risks view