Fixed form retention of fields and search issues