Can now search with ~ and @