Fix for handling selectors with both width and height ranges (#13587)

This fix splits the used regular expressions into a more manageable
parts while fixing the handling of a case where both width-range and
height-range are defined. Also refactored some duplicate code into
a helper function.

Change-Id: I98295b8b0772b33a9985c0630e065eea2281d11d