Fix search using all method, fix layout stuff to pass tests