Simplify Endpoint template and add query menu by selection list
Use query menu as context-menu on list items
Minor fixes and cleanup