Improve search functionality to include Fields modules, dynamic fields