Fix state search