splitting up listener for query nodes and for joins in order to allow query like

#1 . #2 & node & node