Update selection directive to handle cleared model state

resolve #33 and resolve #34