query changes and editor changes

plus annotorius stuff