SRAMP-29 StoredQuery support

+1