More modifications in res search.