MHSearchVC clean up + some small improvements