Moved to lazy loading
updated searchable fields and lazily load widgets.