Working on #700 - Overqualified Selectors

Working on #700 
this issue is fixed by this PR and #709