Tweaks to make the sample gather query faster.

Tweaks to make the sample gather query faster.
Instead of creating a new library term for submissions, I
changed it back to using the stanrard library ontology term.
(making it easier to link things together).

Also apparently you can have nested optional statements.