fix initial loading
work on org selector a bit
fix deadlocks
fix organization selector