VE-1613: Improved handling for "expand" property - modify it only when necessary (clean diffs)