extended form, added validation for empty string, changed search to search all