added schema owner to query
added schema owner to other queries