fixing up validation and adding search support
Merge remote-tracking branch 'origin/master'