Hotfix select and edit

Hotfix to try and merge back functionality that was lost in branch merges.