Note creation and editing, more filter refactor