Addressed review comments and added a spinner when searching - RA-199