fixed event syntax
merged recent changes from annotation-menus
fixed paging issue