SRAMP-29 StoredQuery support

Very good point.  I think I got too carried away with "reuse all the things."