remove csv re-loading; add search controller; cleanup