Fixed expand arrows on data criteria selector, plus tweaked approach