Switch search to work without counts
Change search and activity to use customer instead of account for searching