* Remove include_empty_item: We always want an empty item in dialogs
* Remove include_gap_in_path: This was always true

simplify code a little bit.