Owner query extension fix