Fix a problem with removing report components

Improve component search