fixing caching issues, cleanup of search form api