Removed query from editors and more renaming