move notes/resources into their own setter (code deduplication)
query parameterization
misc code cleanups