Compilation: Remove match property to fix successive select calls