fix CR notes
fix code style
bad equal
fix the error handling
remove catch error line
fix time out
solve conflicts
solve conflicts
PMC-760: Advanced Search Loader UI
fix CR notes
fix code style
bad equal
fix the error handling
remove catch error line
fix time out
solve conflicts with be