more error/edge case handing
cleanup of search views proliferation