Admin list by org

* Popup support
* Return query to the view