API tweaks

Initial work on API and looking at indexes for query patterns.
Do you think it's worth removing this to get the exceptions? FWIW: I haven't experienced that issue.