improved query / styled things