MUMUP-1269 : Fixed the search issue, also fixed a focus on load problem
cleanup
minor merge fix
Merge pull request #36 from UW-Madison-DoIT/MUMUP-1269_fix_on_marketplace_search_does_not_work

MUMUP-1269 : Fixed the search issue, also fixed a focus on load problem