Cleap up search bar
Clean up users