More rule and query edit dialog work