Remove needless import workaround code
Add importing of search keywords