Added a loading indicator during search query
Reformat empty lines
Fix merge conflicts