clean imports
Search work with state and kind