fixed changed self query