fixed a bug with the search, should really be more consistent and start doing this freaking automated tests...