Set up for DECC query strings

For @psd to review