Make people search more robust and add field selectors