Fixes for Serach in ListView