minor renaming, fixing scope error
changes to query/persist UI state (#13 #14)