Finish Role Query rewrite working on specs