Component form: fix merge error
Directory select: don't allow the same path multiple times
Component directory select: cleanup path selection