[OE-2746] changes to facilitate the removal of createCommand queries.