search and tabular fixes