major refactor
add search by organization