Update for non-port query