Fixed device search. Related to STACKOPSHEAD-469