Fix /W and /Q searches