Fix #14 cross search capability that was present in 0.12.x but somehow never made it to 0.13.x.