add table prefix support, remove grouping messages