Added search to markup and client code