adjusted result widget and current serach widget to new fields
another merge