User Search Fixes