Fixing a bug, adding SelectEvents to select trigger path and other minor fix