ticket:4 Added search