JAL-3916 TODO for improved selection of covering structures