[OLINGO-422] More support for expand and select in ContextURL