Add support for use of Query by sctid and description.