big changes + fix bugs for search form