Update the Content module, tweak the user search