Enhanced SearchDataHandler for complexer queries