Added ability to search switches

This comment is not relevant here.