mods to support versioning and query action