NS-705 revert query controller