remove getSelection and update handler
update data handling
fix activity comment indent
update service config and handler