course search form refactor