search form fixed
clean up of the views