-Another fix to the selector - apologies for spammy commits, I need to u...

...se dev as a live test bed.