Trouble with picking surfaces

RH-58382 is fixed in the latest WIP