Added form search fields