b2c7ea6d82
This function will be used in another file with attribute search, so it makes sense to share from the UI storage header.