fix element collapse
improve selectors