SRAMP-29 StoredQuery support

Bit of formatting trouble here.