small fixes after last merge plus correct splitting of existing search

Note: This fails on Travis for the same votes_spec failure.