Imrpove searching for nodes by role