Added ability to search switches