Merge pull request from brainless/develop Updates to Notes, Query editor, and other fixes post refactor