organization view cleanup and such
message deleting
query refactor