Improves readability of NamedSelector xpath expressions

Relates to #434

Now it's clearly visible what is being matched.

__Don't merge until full test coverage is made in #437__