Switched to more generic selector; better handling of multiple occurrences