Revert "tab fixes"

This reverts commit 03bbaf951acb8681197da1ca0deae31a5753410b.
add new composite index