jas tidying up a bit
fixing unstable spec
fixing empty route problem and search bug
fixed search spec