move THISUSER into query