Improved semantic matching of tk-move-out function