searching slightly improved, pages not working yet