Fix Entry Search