Revised search schema