Adjusting Base form for search also base form for add / edit