major changes to search structure