add organization filter and fix login redirection