Fixes for Searching