Issue #2 was handled

The case when the current layer hasn't selected features