limit to dom elements and improved switching venues and categoriess