Added simple query save and open.
Distinguish between sample endpoints and predefined endpoints.
Various UI fixes.