Search result table refactor