fixed dismiss bug when server found no matches
added more tests