Porting a few selector fixes/improvements from "Classic"

[jbertram]

[clebertsuconic]

I would instead of just referencing the AMQ, add some description on what's the issue in the commit message.

I'm always do git log... and having a descriptive commit would help a lot...

not asking anything big.. just a single statement for each one with a short sentence.

[jbertram]

There is a short sentence in each commit message indicating what the commit is for.

[clebertsuconic]

@jbertram sorry.. I did not realize the second line on each commit.. thanks

[jbertram]

@michaelandrepearce, any additional feedback here?