fixes for required fields and search