More variety on tables/counters and refresh option

It would be awesome if the variety on tables was extended. Last night I was creating a tavern and wanted tables with benches. I noticed for the round tables it seems like there are only two models. With the increase in variety it would also be neat if you could click a table and have it shuffle (just like the rooms) so you don't have to keep clicking and deleting till you get a table you like. This would also apply to counters as well.