redid inner popup fix
added RCD and RWQCB query layers.