file structure cleanup
Removed if row is visible condition. Added additional regex that captures the chosen attribute naming scheme.