PSA and Search Fixes and clusters