Updated handling of compound database parameter.