some code format and style changes. Bug fix for search and params for fetch reviewed
some code format and style changes. Bug fix for search and params for fetch reviewed

resource-watch/resource-watch,resource-watch/resource-watch,resource-watch/resource-watch,resource-watch/resource-watch